Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging
authorIan Campbell <ian.campbell@citrix.com>
Tue, 25 Nov 2014 16:24:19 +0000 (16:24 +0000)
committerIan Campbell <ian.campbell@citrix.com>
Tue, 25 Nov 2014 16:24:19 +0000 (16:24 +0000)
commitd85728a3c5e112383e99fc23825fd238a4fb8c63
tree96b239207e1b28ed957396a531062db692ede2d9
parent8f4023dd7d77de7b2c1af77e86637202a33f948a
parent13f72e92a32380e94cb0c86725a1b38a6d191461
Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging